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

Change-Id: Ia6bb07bf98c2ab590244d8f6de0cdfc1f33a1a80