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

Change-Id: I28e2fa81ea66ac094ce9cbec3fd1bc8200ef951a