Merge changes from topic 'basic_vndk'

am: e69f15c9dc

Change-Id: Idf95a23c4b1341145f9e39364235413c82f659ac
This commit is contained in:
Dan Willemsen 2016-11-29 20:42:40 +00:00 committed by android-build-merger
commit 474bba8831

Diff Content Not Available