[automerger skipped] Merge "Remove vnd*.libraries.txt from /system/etc" into...

[automerger skipped] Merge "Remove vnd*.libraries.txt from /system/etc" into rvc-dev am: 998ab5bf -s ours am: fcfe0314 -s ours am: 2a861fae -s ours am: b9f64d74 -s ours

am skip reason: Change-Id I85ab025e1ad490ee7704e4219c5ee611c83ca429 with SHA-1 f5e53004 is in history

Change-Id: I1d3217dcefaafcf32a13e2de5ba47c71019ca5a9