Merge "Tidy ELF builder."

diff --cc compiler/optimizing/locations.h
index ac44a42,e6b55c7..24d7ad3
--- 1/compiler/optimizing/locations.h
--- 2/compiler/optimizing/locations.h
+++ b/compiler/optimizing/locations.h
@@@ -19,8 -19,10 +19,9 @@@
  
  #include "base/bit_field.h"
  #include "base/bit_vector.h"
- #include "utils/allocation.h"
+ #include "base/value_object.h"
+ #include "utils/arena_object.h"
  #include "utils/growable_array.h"
 -#include "utils/managed_register.h"
  
  namespace art {