Merge "Keystore 2.0: Build java sources for AIDL interfaces."