Merge "writerTest: Added AndroidTest.xml to run test with atest" am: 3852387fa2 am: 37ca4a3841

Change-Id: I6a88fb951f0801b3d8a0ad7c2076b8962a9e1a6e