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

Change-Id: I346eaa894cd289fadbc5ed54d99b570f044754d9