Merge "Keymaster should be developed in AOSP"
am: a5e28d6abf

Change-Id: I290f732459635300fa84ca69523d2935bec9fd89