am 189f9522: (-s ours) am 2d3e4d22: Merge "Generates SDK stubs of android-support-multidex"

* commit '189f95221cbe673675fa9719e3c39db8e3b30bb0':
  Generates SDK stubs of android-support-multidex