Merge "android benchmark fixes"