Merge "Use real prebuilt module for JavaPoet"
am: af8399ee06

Change-Id: I044e36e94a70d8b4c24062b91a00a73e9b8daed1