Fix prebuilt_info in R branch so that we don't get merge conflicts again when submitting changes to AOSP am: 25096215cb am: 180e2b5c51 am: 3dad9161ec am: 11e1eac41e

Change-Id: Ib970a7237d79652af2ebd036c60fe539f770260b