Merge changes I6873ee37,Ia18ee6e4

* changes:
  ExportResult implement Parcelable interface
  OperationResult implements Parcelable interface
tree: edfa6130c18cb06e4f5730f8305b1aa3f09ebd5a
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/
  4. MODULE_LICENSE_APACHE2
  5. NOTICE