am c58e9de8: am 9df1cb50: Merge "Remove old grandfathered ALL_PREBUILTS"

* commit 'c58e9de8078aedc7b290e15d14ef436860909d55':
  Remove old grandfathered ALL_PREBUILTS