Merge "[frameworks][base][hwui] fix -Wimplicit-int-float-conversion" am: f7cf0dfa55 am: 0b6b756f3d
am: d171f486f6

Change-Id: I64ee854c7efaabe03f7ce65778041023bf4457e2