Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-gingerbread

Also includes cherry-pick of 07ecdc0b5d92099364eebdaee9aec297c4bbad72

Change-Id: Ie1744d78683f2f66dd1586f453f8bdd56ad2e9a5

diff --cc vm/Dvm.mk
Simple merge

diff --cc vm/ReconfigureDvm.mk
index 1284bc8,62a0e0f..13138f8
--- 1/vm/ReconfigureDvm.mk
--- 2/vm/ReconfigureDvm.mk
+++ b/vm/ReconfigureDvm.mk
@@@ -22,8 -22,8 +22,10 @@@ dvm_simulator := $(TARGET_SIMULATOR
  
  include $(LOCAL_PATH)/Dvm.mk
  
--LOCAL_SHARED_LIBRARIES += \
-         liblog libcutils libdl libnativehelper libz
 -        liblog libcutils libnativehelper libz
++LOCAL_SHARED_LIBRARIES += liblog libcutils libnativehelper libz
++ifneq ($(TARGET_SIMULATOR),true)
++LOCAL_SHARED_LIBRARIES += libdl
++endif  # !TARGET_SIMULATOR
  
  LOCAL_STATIC_LIBRARIES += libdex
  

diff --cc vm/compiler/Frontend.c
index 40da0e1,8e5a5e2..157bae4
--- 1/vm/compiler/Frontend.c
--- 2/vm/compiler/Frontend.c
+++ b/vm/compiler/Frontend.c
@@@ -874,10 -877,10 +877,13 @@@ bool dvmCompileTrace(JitTraceDescriptio
      /* Set the instruction set to use (NOTE: later components may change it) */
      cUnit.instructionSet = dvmCompilerInstructionSet();
  
++// FIXME: temporarily disable inline [Issue 2936748]
++#if 0
      /* Inline transformation @ the MIR level */
      if (cUnit.hasInvoke && !(gDvmJit.disableOpt & (1 << kMethodInlining))) {
          dvmCompilerInlineMIR(&cUnit);
      }
++#endif
  
      /* Preparation for SSA conversion */
      dvmInitializeSSAConversion(&cUnit);