Merge "Split dex_file_loader_test" am: 9b559574cb
am: 84fafd5f57

Change-Id: I47f1396ef7d4008ae26bab7b4a29f0314d29633e