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

Change-Id: I81a0531525ebb1e0ce6870a4f46b8128a940ebb2