This reverts commit 4b9d00ac. Reason for revert: breaks renderscript mac and run_host_tests in master. Change-Id: I6024894a384c65f3e7d81b9c5bba8ebe8ce1b420