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

Change-Id: I0ffe13de72318422a81218be58fa0ddeeae80a14