Merge "[libstagefright] fix -Wimplicit-int-float-conversion" am: 6c525b799c
am: 82f49a0c7c

Change-Id: I1e63102bf019058515b6938b6ad27402fddbf044