Merge "[libstagefright] fix -Wimplicit-int-float-conversion"