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

Change-Id: I8bce4fd1d58ac72d813d07763c588df69fdd45c6