Merge changes I81796b45,Iaf585336

* changes:
  Desugar default methods if required
  Always raise proguard libraries