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

Change-Id: I9050f22aa5bdf642f21ef186042dc6b64eeef644