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

Change-Id: I163269ff5e1de357fc4f436d8d0e71b6862ee292