Merge changes from topic 'vndk-def-tool' am: c5a534236e am: c55813a336
am: 069cba02c1

Change-Id: Idf49ee65b5e2408ce48a2c9652e1a6d7b7c24ec9