Merge "Use target.linux for all linux kernel based targets" am: 0cb9cd4d75
am: 7f5367e3eb

Change-Id: I168bf5da9a6fb84bfd7ec5af5f45a3fecf8bdeb6