Merge "Specify version for aidl_interface explicitly"