Merge "Remove the unnecessary indirection of TARGET_STRIP_COMMAND"