Merge "Remove microdroid build of keystore2"