Updated POMs to better fit the multi-module build. Hopefully.

Change-Id: I70eb68be1c28daa33eb4509e3a19ac84b2024663