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

Change-Id: Ib02a20681078fa329bec92a3348608b5122f7544