Merge change I1932e8f8 into eclair

* changes:
  Disable com.android.unit_tests.HeapTest:testExternalOomeLarge.