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

Change-Id: I8e7398797b53eab6efdebf7b5e83f6573ee5f83c