Merge "Add platform hidl interfaces to mainline_system"