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

Change-Id: If5a28f342bf2ee70f917c40274b246dc600ccb3a