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

Change-Id: I2f28cd59087aff7726c1dab79ceaeb15e5edd6c9