Merge "Remove hardcoded min, targetSDK for 'R' version of modules"