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

Change-Id: Idc9f564f50dbad88f5610d80b57e3e5bc225d604