Merge "Revert "Revert "Split Java libraries per apex""" am: c89fe625 am: ccca43f9 am: ab6de410 am: 011b8be1 Change-Id: I716cea51b2bd2718efdf10abc6ba45c38c52772e