Merge changes I82aa8140,Ib62a5dd6,I2c4d64e2

* changes:
  Enable multidex for SystemUITests
  Add missing transitive dependencies
  Revert "Remove support of disabling Jack."