Merge "[AWARE] Update HIDL interface and link to legacy HAL" am: f825133092
am: 787ea6b1de

Change-Id: I8965de77d701da64939b6089fcb355440422079e