Merge "Update health AIDL HAL to V2"