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

Change-Id: I91615f6fecc386c88d6ad060ae34f9342d49a9ec