Fix prebuilt_info in R branch so that we don't get merge conflicts again when submitting changes to AOSP am: 25096215cb am: 81c76c281a am: 9041f33362 am: 2c91874167

Change-Id: I63f977ca8bb4697b4e1b0d4e3d85300955c8eaca