Patented nuclear merge in api, tools/aidl and Android.mk

a.k.a. selectively checking out files we haven't modified much from a remote ref

Change-Id: Iac5d7fdb9e166e0baf3aa53ca440f7a6af6cc4ab