am daafd544: am dffa96f7: Merge change I90daccf3 into eclair

Merge commit 'daafd5441af5a180edd20d6edf74a9bd8117a287' into eclair-mr2-plus-aosp

* commit 'daafd5441af5a180edd20d6edf74a9bd8117a287':
  fix [2143798] Need to figure out how to do video on Passion w/ GPU