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

Change-Id: I078a17c9f6e05f3fe97ca877a54abe58c2aac487