* changes: Merge changes from topic "keystorebp" am: a12eab69 am: 315bbfc2 am: 24611949 Export AIDL for keystore Android.bp. am: 01478ec1 am: f179a478 am: b5154d71 -s ours