Merge "Fix google-explicit-constructor warnings in libs/hwui." am: 7207562ff7
am: d7a69e04eb

Change-Id: I78ea5c2e7036c5d5c7f5573b4eef208b0ff93b99