Merge commit '76bb9a363633b5741937ebe58b01a8b2024753b0' into eclair-plus-aosp * commit '76bb9a363633b5741937ebe58b01a8b2024753b0': Disable com.android.unit_tests.HeapTest:testExternalOomeLarge.
Merge commit '76bb9a363633b5741937ebe58b01a8b2024753b0' into eclair-plus-aosp * commit '76bb9a363633b5741937ebe58b01a8b2024753b0': Disable com.android.unit_tests.HeapTest:testExternalOomeLarge.