Merge "Use target.linux for all linux kernel based targets" am: ab62265fa1 am: f973417005
am: abb3521abe

Change-Id: I0bd597eb6817aec682d0792a8a5afcfcb7e19cda