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