Merge "stagefright: disable B-frames" into oc-mr1-dev am: fe5f909f2a
am: 9600c9d070

Change-Id: I7891810fff2c53c09592a2c77106dec7ad169337