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

Change-Id: I3b062d044ef7a88498edeaf5c1fcd0f3387d2943