Sync jb-mr2 prebuilts to be the same as AOSP and master DO NOT MERGE Change-Id: I046b711e65c18278f40ac3bdcf61ba4a5a6e6a57