Merge "Revert "Use the correct prebuilts for lifecycles.""