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

Change-Id: Idf52c715cc1cc32d51e61301947b1913f347d7e5