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

Change-Id: I563682f7ba034c2a9ac9db34ab2e5f55bfd39d9c