Merge "Switch aidl and zipalign prebuilts to build-tools" am: d6f229842a am: 84d0f704eb
am: 2f67c165c3

Change-Id: I5866b54b96d6a9e1f6101740963fe19a79151478