Merge "Keymaster should be developed in AOSP" am: a5e28d6abf am: e84234afc8 am: 2657dcc125
am: f3fe582f05

Change-Id: I88a569e7a6aa99b3b93f392e2f67bf246ae8add2