Merge "Deliver android-support-multidex.jack in SDK"
am: da07dcd7f9

Change-Id: I7e9e51ade83f3cc2b7d141a45ec1a43fac804b4e