Merge commit 'a72bb404ceb11ac551825226eb75d2a280deb1b2' into gingerbread-plus-aosp * commit 'a72bb404ceb11ac551825226eb75d2a280deb1b2': Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs.