Merge "Remove the extra buffer allocation from hwui" into sc-dev