Merge "Retire cbmananger from EmuHWC2" into rvc-dev am: 4eedfee636 am: 93549cff4b

Change-Id: Ib489ae8edf2383a6d8b4b621bb7b7ddf7640f3df