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

Change-Id: I16576f89e09c6b24752ee25e929fa5d4b356cd7d