Merge "media: test with platform limit instead of reported limit" into mnc-dev