[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 am: 1c20a87e am: 5473e52e am: a2fa982f -s ours

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

Change-Id: Ie6048fa2a7b6d86d344b4ceda72f45c08930933c