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

* commit '241e1565faed018590fd618b92351a9f47bf4e12':
  Package Jack and Jill directly from prebuilt