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

Change-Id: I9e1c2bb3fe5dec0d42cc0fd8f1f488207291a608