Merge "Revert "Disable Android.mk in new aidl repository""