Merge "Use prebuilt otatools for mixed build" am: 10fc92d276
am: cd69b1c0dc

Change-Id: I9ed5814f8c1b03058b515b9146fbf493b0f0172a