Bump Android Plugin version
Break down large methods in smaller steps