am 3b8a1b35: am ea48cd6d: Use a diff that ignores trailing whitespaces to get by some layout test failures.

Merge commit '3b8a1b3513bae8fc0846d52121d243bec7cb65b8' into eclair-mr2-plus-aosp

* commit '3b8a1b3513bae8fc0846d52121d243bec7cb65b8':
  Use a diff that ignores trailing whitespaces to get by some layout test failures.