Adding multidex support to vogar am: 388fcad526 am: 4904ba849e
am: dd2e92f185

Change-Id: I6dc7e4b759445908b02fac817b73a0f640babd72