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

Change-Id: I403fccca9e4c6c4bda250212003064f5f3177d2e