Merge "Fix default keymaster so it doesn't start an extra thread." into pi-dev
am: d5a5888c60

Change-Id: I0fe9657eb253cacca7a2e1613cc7a5e774608dee