Merge "Expand mediaextractor dumpsys" into nyc-dev