Merge "Mark VINTF AIDL w/ Java as platform_apis." am: cd99e3f2eb am: 0dca6460ba
am: 253992b4e6

Change-Id: Iee49bae9ac1fc3f5668c1bb0c0769c8bf0dee11a