Merge "Define MediaFormat crop-related constants" into tm-dev