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

* commit 'ad9387974b02528ff0366134a3740d66fb0b1cd5':
  Revert "Frameworks/base: Unused parameters in hwui"