Merge "Add VNDK version for namespace configuration files" am: a6e6780418
am: a159b310d6

Change-Id: Id60fc219eecdc7b9a7d9e69fd7ee3948f0907cf0