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

Change-Id: I4dd806771c3052bd1fe48206aebf2066930f994b