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

Change-Id: I41b172ff2315b4b295e344ac52bf568e1c3168e4