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

Change-Id: I4e721d8022bd6da904af939b4d9c606d5fa3db1b