Merge "Add AndroidTest.xml for keystore2_test to support coverage"