Merge "Revert "Force Jack to consider multidex annotations""