Merge "Add keystore2_microdroid"