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