[automerger skipped] Merge "graphics: add libhwc2on{1,fb}adapter" am: 86b9e6d4b6
am: aa8814d2ef  -s ours

Change-Id: I84e2d05c78e074dcc4b5234c15756f27a5f5d1c0