Merge "Use target.linux for all linux kernel based targets" am: 3a2f64dbcd
am: 6e6821471f

Change-Id: I3a075b36a912d0e41eea7d6a7c5bf358259ec393