Android CTS 6.0 Release 12 (3417974)
am 94d92d94: (-s ours) am 479e42ba: bootstub: only build for moorefield, merrifield [DO NOT MERGE]

* commit '94d92d94866d3dc1c1ba5c9dff651ceb419f65cd':
  bootstub: only build for moorefield, merrifield [DO NOT MERGE]