Merge "update hidl .bp" into rvc-dev-plus-aosp