Merge changes from topic "check-vndk-dep2" am: 8dd2bafcff am: a2a965b2b1
am: db15a0fb6d

Change-Id: Id57ca7baef28a2c87423db12a720be5d48b5d7cc