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

Change-Id: I14809dd61e5ad26ac367ba0005da28b8b12e9a7b