Merge "lshal: update test manifest to 2.0" am: 5a99fe853e
am: 4c89b924ef

Change-Id: Icdd9b185758280df5a8ad175be43c94bc096d969