Merge "Keymaster should be developed on AOSP"
am: aac806ae5b

Change-Id: I4c5b72d7c22ef7e4148c657f3e1c71e651728a3f