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

Change-Id: If8f1d78e2cdf0ae3432a02cd534a588c9bb44bf0