Merge "Clean up the definitions of tools binaries in the Runtime APEX modules." am: fafc2d9a am: 3f7f8f8f am: ecc9adcf Change-Id: I9ec465c9ea16e095e827105cb596aa00b3553704