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

Change-Id: I9d51aa7eb651393af9c6f0504d3605711805c1cc