Revert " test with aosp trees"

This reverts commit 1a6a4251f3e00a4b7ab5c29b1d239c54e92f2d80.