Make keymaster more self contained am: 4427bbe0b4  -s ours am: 4707aa3a9a  -s ours am: 7c0b5b61eb  -s ours
am: 02f8d8a136  -s ours

Change-Id: I60e81d76b13da2d903941788064ea409904257e6