Merge "Revert "Remove futility prebuilts."" am: 392c38c7b8
am: 9b1b4c26b5

Change-Id: I2ef0914fded780b65bf2fdb382e7053ee64c7cd9