Merge "Make dexdeps multidex aware" am: 2775aa39f8 am: cc3d9f3cea
am: cc20d978c2

Change-Id: Icdfb8ab869bedcc76b2f968d27340ba1aed00d28