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

Change-Id: Ibd0dc3310dea24ffd4e6d9679397db5e7fa59905