Merge "Package Jack and Jill directly from prebuilt" am: 241e156
am: 2e8682b

* commit '2e8682bfaae80fc55731f89aa060df552a508bef':
  Package Jack and Jill directly from prebuilt