am b7a34e49: Merge "Add license banner to recently added AndroidKeyStore files."

* commit 'b7a34e4955beae2cee81a27e7c240316078bbf2f':
  Add license banner to recently added AndroidKeyStore files.