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