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

Change-Id: I0efc62e8c5022dbdfc8618fdaa98d36ff560a2a7