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

Change-Id: I9d6b8e7c2efe1d8ff11619065e331437bd124e28