Merge "lshal: update test manifest to 2.0"