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

Change-Id: I328526ffc2d62cf49ec359c486688350be1ac850