Revert "Change exception message for ArrayStoreException."

Fix all the libcore.java.lang.ArrayStoreExceptionTest failures. Why
are we pulling cosmetic changes from master?

This reverts commit 653ffbf481aa19c4f6c9a358b33d0d812758dfe5.

Change-Id: Icc4d1b40c578a5eef6890e9a03c7b10a96b75c0b
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Revert "Use MAP_FIXED in remapNewHeap"

This reverts commit 462bc921aefe3b96e8cc7dae91e234b0e455966c, it
breaks android.openglperf.cts.GlAppSwitchTest#testGlActivitySwitchingFast

Change-Id: Ic153994859f678dbef4328bee5740e21beb735e0
Dalvik :Increase the upper limit check for DexOpt Deps table

Increasing upper limit check for the Deps table as additonal
jars added causes the dalvik to crash while performing dexopt
on cached jar files. This is needed for passing cts test case
which is part of libcore.java.util.jar.DalvikExecTest class

Change-Id: I5431238839712499122eb35132599230d8610de8
CRs-Fixed:621955
Use RETURN_PTR(NULL) instead of RETURN_VOID in newNonMovableArray.

RETURN_VOID doesn't set the return value. This means that we are
returning random garbage when the allocation doesn't succeed.

Bug: 11971220
Change-Id: I570562c7bb9dc573161294916f582709774b35fd
Revert "dalvik: add placeholder for future changes"

 * There are GC issues with this version. Rollback for now.

This reverts commit cdf7a375a8e44fad85e90e7234e561088b20a897.

Change-Id: I983a14a7c39f99427e4a437f1a752fc99db91e28
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0

Conflicts:
	vm/alloc/HeapSource.cpp
Revert "Revert "Show size/alloc/free per Dalvik heap space in dumpsys""

This reverts commit 293ad9de2a258a47a63df91e27d9d41a1ad01b63.

Change-Id: I4fc8ab048d478a590e7d775ea180126ffe1b1287
Revert "Revert "Revert "Show size/alloc/free per Dalvik heap space in dumpsys"""

This reverts commit 484812b72d7e19fabadf2a79b12e9427acea8429.

Change-Id: I86f18b574eb7be0127de936e90de2896e919b3dd