Few tests failing: oat_file_assistant_test and jit run tests. This reverts commit 0a9b6826. Change-Id: Ibbf73c191d244ebb9517b6ae97971dd9a9d37d7c