Merge "Fix oat_file_assistant_test for devices with low memory."