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