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

Change-Id: Ic4d463c029862036dc9928332dbadbb8e336881f