Merge "Remove hardcoded min, targetsdk for 'R' modules"