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

Change-Id: I2f3039e9786dda3a1d5fbb664b6fba35247a95d0