Merge "Unzip bin and libs from otatools.zip for build_mixed" am: 19bb9e6731
am: 5335783cbd

Change-Id: Ib1de9ddccf05e6b15419eee30bd8591ca281c7dd