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

Change-Id: I3e1458a8d4b4938dfdbe657303847bb743184138