1.2.11: honor dexMaxHeap in android:test
Merge branch 'master' of z:/android/sbt
1.2.11 addendum