Merge "Mark VINTF AIDL w/ Java as platform_apis."
am: cd99e3f2eb

Change-Id: I97a39d7a79e211887ac8208687e34336a7bb8c3b