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

Change-Id: I6a7a91d930f7789ca78370f0c0e0e306dad87028
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_frameworks_av into cm-10.1