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

Change-Id: Ie5b4edc4cd5cbffae6a13492efab053a81a0489f