Merge "dx: Rename test generator script for 135-invoke-custom" am: 466473ac87 am: b05f62a0c0
am: 1dc8d4a6d9

Change-Id: Iab51088fe76e5ca376563e7eed54fba01ee7c714