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

Change-Id: I4e80eaf321cc3aee1e65437e7c9a1f20479e7f16