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

Change-Id: I763cc15ee57a685a091b3ea6e988b1244191b4a1