Move to using 2.2.3 of Android Gradle plugin.
am: 3fa42d8f76

Change-Id: I32e08a710996b68e6c05666cc500914bc6ed617f