Merge "Make dexdeps multidex aware"
am: 2775aa39f8

Change-Id: I93a6a8429952b2636f7e8d1bb674f0caf757c1f1