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

Change-Id: I089b11d00eca6ddf5342ed6b66e5318f91260fe1