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

Change-Id: I4ac8aab10321e26e558d71e61376aa712f177c95