Merge "DO NOT MERGE ANYWHERE. Move to a stable Android gradle plugin." am: 88e5a9bcd6  -s ours am: 3d1b00315f  -s ours
am: 7ae240cf4a  -s ours

Change-Id: I2503c3bb919cd09ad0d3ebd06ffefdbbc7ad0c53