am c7aef5d0: Merge change 25477 into eclair

Merge commit 'c7aef5d0fda58a1685e5584b34e1b80ba016f017' into eclair-plus-aosp

* commit 'c7aef5d0fda58a1685e5584b34e1b80ba016f017':
  Make ACTV use all available space if height is FILL_PARENT.