Merge "Updates all templates to use the latest version of gradle and adds...
Merge "Updates all templates to use the latest version of gradle and adds support for multiDexEnabled, specifying compile version, and updates repositories code. am: 134b52aa am: 443b936b" into oc-dr1-dev-plus-aosp