Merge "Do not fail when there is no vndk namespace" am: 6534c60e43
am: b98aaf83a9

Change-Id: I81372fb8c8dc6f72c7ac6a4f3b98a8cc1a7bed9c