Merge "Make contexthub aidl available host side"