Merge "Allow full_x86 and full_mips in unbundled build." into jb-mr1-dev