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

Change-Id: Id28e99f1b7c5e2e3771d807bdd9487292d650209