Update to the final version of android gradle plugin 2.2.0
am: 929f425345

Change-Id: Icc8c8504860e186696af1572bebf493458542223