Merge "update vndk list"