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

Change-Id: Ia6b0e4d9444fff1152d46c3a129e83b889f4ebf5