Merge "OpenSLES: Remove unused variable" into main