am 6526e63c: Merge "Allow opt out of auto adding Support Lib dependencies" into klp-dev

* commit '6526e63c6b3a05497661af242a5bfb8686da11ab':
  Allow opt out of auto adding Support Lib dependencies