Merge changes from topic "add-vndk-again"
am: e8d0bd6337

Change-Id: Ie8ca12340b3994883379d5f96b06f19855175f3f