Jack Release 12-b4
Merge "Revert "Revert "Increment dex version for N api level use""" into ub-jack-carnac