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

Change-Id: Ifaca0367ae51d9b4ca59bd4cec3acb8df1dd194c