Merge "Benchmark: Fix for audio encoders on Android 9" am: fb4c783676 am: 999544b818 am: 5f0d33cb90

Change-Id: Ia487934b5920abd58577ffaf84359cf4fb943c5b