Merge "writerTest: Added AndroidTest.xml to run test with atest"