Merge "def-tool: Add APEX module support" am: a9c00011f3
am: 60996049e3

Change-Id: Iec3601c7806c81d1891d67db64036eaf4233c8e7