[automerger skipped] Merge "libhwc2on{1,fb}adapter: move to hardware/interfaces" am: 93a0198e5f
am: e85a3d15d3  -s ours

Change-Id: I59f0b4225800a49c365e7fb9bbdadb0d67fd4b17