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

* commit '920e1230d617ec1194dc22cab3ec9d704e1b30dc':
  Revert "Force Jack to consider multidex annotations"