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

Change-Id: I186015be510fd2afb15d04de266c8731b2710de8