am 4ab52e75: Merge "Don\'t require three-character extensions for dex locations."

* commit '4ab52e75c782abf19ff9ebff8d19c87ec4ec97b6':
  Don't require three-character extensions for dex locations.