Revert "Revert "Upgrade HWC from 2.1 to 2.3""

This reverts commit b64da5cf7ac7b4dcacd4ebb7e1c772396e4b3d9b.
Fixed some merge conflicts.

Bug: 147264301
Test: blaze --blazerc=/dev/null  test -- //javatests/com/google/android/apps/common/testing/flakemeister:FlakemeisterTest_google_30

Change-Id: Id60b61737833881d4f7bdd190cdb6f8ca0de9157
Merged-In: Id60b61737833881d4f7bdd190cdb6f8ca0de9157
(cherry picked from commit f8245228ff1bf45983f6415dc15f9bcfee715148)
4 files changed