Merge "Add glide annotation processor" am: f0d56cafa4
am: f380574aed

Change-Id: I02ef66db9735e146d35955cdc4352d3abf6e031f