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

Change-Id: I4c11bf61eaf53fc39b750dc9b629a509937711c7