Merge changes from topic "add-vndk-apex"
am: a1ebc66b6f

Change-Id: Id85c73c263aac012906ebaea2f9b0ff269c9b69a