Merge "Allow opt out of auto adding Support Lib dependencies" into klp-dev