Merge "Reduce cuttlefish targets" into master-cuttlefish-testing