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

Change-Id: I6722c3d33dd56b1b9f7b0c66714bda396bc981e7