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

Change-Id: Idb2bda1ec9ae76f88b48aafd43ddc1a4696d44e4