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

Change-Id: If61075edd4f2d4d0e36cbdd05705440a5dc03505