Merge "ART: Convert pointer size to enum"

diff --cc compiler/optimizing/inliner.cc
Simple merge

diff --cc compiler/utils/x86/assembler_x86.cc
Simple merge

diff --cc compiler/utils/x86/assembler_x86.h
Simple merge

diff --cc disassembler/disassembler_x86.cc
Simple merge

diff --cc runtime/Android.mk
Simple merge

diff --cc runtime/class_linker.cc
Simple merge

diff --cc runtime/entrypoints/entrypoint_utils-inl.h
Simple merge

diff --cc runtime/gc/collector/concurrent_copying.cc
Simple merge

diff --cc runtime/jit/jit_code_cache.cc
Simple merge

diff --cc runtime/mirror/array.h
Simple merge

diff --cc runtime/verifier/method_verifier.cc
Simple merge