Merge "Adjust check for target_sdk_version for workarounds" into nyc-dev
am: f2c2c07

* commit 'f2c2c073541c42abf72d6d23583c217d7437797d':
  Adjust check for target_sdk_version for workarounds

Change-Id: Ie9bb20386fb612db61a21e36c3e9bf831e0eeb1c