Gradle Plugin Release 2.3.0
Merge "Remove old headers and libraries." am: dd39467272 am: e09a5a158d am: b8794abb29
am: f715513048

Change-Id: Ic250b97cd72d020882c9fb439cc5411ddf5f7f24