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

Change-Id: I6f7adee18c990ca5a95668cc7a8ccfbab8fd169c