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

Change-Id: Ic05e1c9dfd9496bb5ff99bc0cace026f83dbec82