Merge "stagefright: allow controlling experiments from property" into mnc-dev