Merge "Keymaster should be developed on AOSP" am: aac806ae5b am: e341fff221 am: fc194d7253
am: 558fc53d5e

Change-Id: I1aee13a5feaf3b84cc8db60ad54df3a7e8b6e850