Merge commit 'baa44f1109ebaa723d64ffee09d5b436749cd7c2' into eclair-mr2-plus-aosp * commit 'baa44f1109ebaa723d64ffee09d5b436749cd7c2': Suppress flaky test HeapTest#testOomeLarge.
Merge commit 'baa44f1109ebaa723d64ffee09d5b436749cd7c2' into eclair-mr2-plus-aosp * commit 'baa44f1109ebaa723d64ffee09d5b436749cd7c2': Suppress flaky test HeapTest#testOomeLarge.