Merge "Some tests are run from /data/local/tmp, and they need proper namespaces."