Merge "Do not add VNDK-SP libraries if VNDK is deprecated" into aosp-main-future