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

Change-Id: I80e06807eb1676b5cc6830a310289d388d710d68