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

Change-Id: I324b5572e68b64378ae70076258f677a64a1d0ab