Merge changes from topic 'upgrade-smali'

* changes:
  Update smali/baksmali to 2.2.0
  Merge remote-tracking branch 'aosp/upstream-master'