Merge "Clean up the definitions of tools binaries in the Runtime APEX modules." am: fafc2d9a97
am: 3f7f8f8f9b

Change-Id: Ie07b33ab5590a275d374920ba6a7a7447b2262da