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

Change-Id: I11f0cefc9525eb56e6aebe71545b77b57657c325