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

* commit 'f3b86591055b50c327857aae45cb358bcb7512c4':
  Allow full_x86 and full_mips in unbundled build.