Merge "libkeymaster1 split" am: 06254de12a  -s ours am: 876c7be912  -s ours
am: 6c3bdb8848  -s ours

Change-Id: I2c020d97a120652b0815646f059725f6f402476b