Merge "Add VNDK definition tool." am: 3a955d4ad6 am: 24868d284c am: 2c9672e1f5
am: 4cd7ccdf3b

Change-Id: Id42cc0abc9e7e061ad8e3f907dcc6128700189c6