Merge "Replace javapoet-prebuilt-jar with javapoet"