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

Change-Id: Ic03c78b475db8f5838b09cba503e405481db6922