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

Change-Id: I9853ad34210aa4acdb9e31546b651ee28db31b16