am c404ed2b: Fix failing unit test; the test was using a deprecated API making it fail on WVGA devices.

Merge commit 'c404ed2be5d29c8932a3d69b53fea4653c9b868b' into eclair-mr2

* commit 'c404ed2be5d29c8932a3d69b53fea4653c9b868b':
  Fix failing unit test; the test was using a deprecated API making it fail on WVGA devices.