Merge "dx: Add support for invoke-custom"
am: 95d82f9f6f

Change-Id: If746b98728be9ff19d0d97b437b0cb605fa928e5