Merge "libstagefright: support for disabling buffer metadata" into cm-10.1