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

Change-Id: Ib9da087edf3f7e762506fb86a1f72b3df9752fa0