Merge changes I0508b2cc,I3d6bbc36

* changes:
  Don't desugar static java libraries
  Use DEFAULT_APP_TARGET_SDK for dx and desugar