Merge "def-tool: Update vndk-lib-extra-list-current.txt"