am f40ac8d6: Merge change Ic4387354 into eclair

Merge commit 'f40ac8d60519c871e35a4ea4b80c6c64b13cbc3a' into eclair-mr2

* commit 'f40ac8d60519c871e35a4ea4b80c6c64b13cbc3a':
  Make WVGA/High skins use a higher VM heap size.