Merge "Do not fail when there is no vndk namespace"