Merge "Makefile: Add the dependency for BUILT_OTATOOLS_PACKAGE." am: c6ad99c926
am: f5529878f8

Change-Id: Idb2cc5081903e70b9869741d8bf4bd355701631e