Reduce cuttlefish targets

Change-Id: Id4ffc88fac0e0d240f57ae517be088d6429170df
24 files changed