Merge "Export AIDL for keystore Android.bp."