Merge "Makefile: Remove the duplicate lines for OTATOOLS." into nyc-mr2-dev-plus-aosp
am: 443d5fdf24

Change-Id: I335bead53e07b5c1b7a54bd7f38dffb8c971db79