Merge "Revert^2 "health: require AIDL HAL and deprecate HIDL HAL.""