am 7d762002: Merge change I097b444e into eclair

Merge commit '7d76200234bace44816f6328d2327ffb9d9c0a18' into eclair-plus-aosp

* commit '7d76200234bace44816f6328d2327ffb9d9c0a18':
  Fix ApiDemo Layout rendering test