Remove poc dependency on AndroidTest.java

Bug: 171320823
Test: run all of STS
Change-Id: If2107a21dbc2dd112dfc1b760dfe5c13f98dee59
Merged-In: If2107a21dbc2dd112dfc1b760dfe5c13f98dee59
2 files changed