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

Change-Id: I93c8ec1d1a001803ec23ccfd0e18e61cf1945f60