am ada0deb4: am f5a8f2f4: Merge "Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs." into gingerbread

Merge commit 'ada0deb4c295f18add04a474c2b396c87b0bee09'

* commit 'ada0deb4c295f18add04a474c2b396c87b0bee09':
  Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs.