Merge "Remove poc dependency on AndroidTest.java" into oc-dev