Merge "Update manta self-extractors for JOB32B" into jb-mr1-dev-plus-aosp