[automerger skipped] Merge "Update VNDK library list for IDumpstateDevice...
[automerger skipped] Merge "Update VNDK library list for IDumpstateDevice 1.1." am: d0511cfb am: be4035dd am: 2ce22e4b -s ours
am skip reason: Change-Id I5a89afc0be91c1874ae38b6e00f8239c2cec71ab with SHA-1 c6cd7f43 is in history
Change-Id: I9994fe82e9636b7a89c682e70ec506001839d5e7