Merge "Fix typo in AndroidTest.xml" into pi-dev
am: 0ff4e9b586

Change-Id: I9ea0f671839a3f841329e314ea040c8defc18fd5