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

Change-Id: I4f819e71001ce250405e64e481e4382054914f9f