Android plugin source lint + parameter type fix

Did a lint on the source as per Google Java formatting recommendations.   Also had to change the parameter of MapBuilder.createTiming to match the new signature where it takes "long" as the second parameter".  Also removed the else before the return statement so that lint doesn't complain that the function lacks a return.