Merge "min_sdk_version should be (level) and not (kind+level)." into tm-qpr-dev