Merge changes I3bafbb2d,If30943ef

* changes:
  Desugar default methods if required
  Fix desugaring when LOCAL_SDK_VERSION is not set