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

Change-Id: Ic1862e1a3fbc49182809118a66f3ce86e053e520