Merge "libstagefright: add xml parsing for measured-frame-rate and measured-blocks-per-second." into mnc-dev