Merge changes from topic "add-vndk-apex"
am: 3453a37f5e

Change-Id: I0799cbab0c82cd37893d44c87b08e54e71ebbf82