Merge "Revert "Frameworks/base: Unused parameters in hwui""