Merge "libstagefright: parse concurrent-instances." into mnc-dev