Merge "Add lshal to embedded.mk." am: cbc8f16656 am: 1a375ded9a am: 1030be9543
am: 21a7e626f2

Change-Id: I930f8a5cccc341178e0d25c1c8599753bb7a4e47