Android S Preview 1
Merge "Specify version for aidl_interface explicitly"