Merge "Switch to HIDL service based HAL"