Merge "def-tool: Fix VNDK-SP warnings on APEX bionic"