Merge "Roll back to gradle 2.1.2 to fix builds. am: a990867a8e am: 9717a5047e" into nyc-mr1-dev-plus-aosp