Merge "Use on_vendor VNDK APEX for non-REL build" into rvc-d1-dev-plus-aosp