Merge "Multi-package support for APEX."
am: 1b676027c4

Change-Id: Ifc2287728e0e058f0ce9f5783cd3b3cd1e180e57