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

Change-Id: I8ae80ebc6ca0a1c8344525c18271e91eb1b06e78