Merge "[frameworks][av] fix -Wimplicit-int-float-conversion"