Reduce cuttlefish targets

Change-Id: Id4ffc88fac0e0d240f57ae517be088d6429170df
(cherry picked from commit d761a323476f3cdef1cd31b3940887d25883fc15)
24 files changed