Merge "Mark VINTF AIDL w/ Java as platform_apis."