Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: I99fd033d86f07f97f4d2c9dd6008da9d62e3bcf2
tree: 10d2fae2245e3aef8136513f8b6f4e12cd8664d6
  1. keystore/
  2. keystore-engine/
  3. softkeymaster/