Merge "def-tool: Update vndk-lib-extra-list-current.txt" am: 688f152463
am: df67fe342d

Change-Id: I9e29e6aee6437966972aca3ed7885ea9f5867aaa