Move keystore to foreground cpuset. am: 1140ef6
am: 37ca417

* commit '37ca4172bb9c62ff25b5277ad7066935f538b749':

Change-Id: I4f148c051fb195e08f8c8c45dc651a665f73e25b