Merge commit '5f2ae667e89e5ddfd7aa2bcbe3017b746b7b1de2' into eclair-mr2-plus-aosp * commit '5f2ae667e89e5ddfd7aa2bcbe3017b746b7b1de2': Disable com.android.unit_tests.HeapTest:testExternalOomeLarge.
Merge commit '5f2ae667e89e5ddfd7aa2bcbe3017b746b7b1de2' into eclair-mr2-plus-aosp * commit '5f2ae667e89e5ddfd7aa2bcbe3017b746b7b1de2': Disable com.android.unit_tests.HeapTest:testExternalOomeLarge.