Merge "Revert "Force Jack to consider multidex annotations"" am: 920e1230d6
am: 16d7cbbd42

* commit '16d7cbbd42c6690592b4dda7823f2693b7829dba':
  Revert "Force Jack to consider multidex annotations"