Merge "Remove VNDK warning." into oc-dev am: ca243f2fcb
am: ed08b90e48

Change-Id: Ia78ce30b04c2ec8c7a905cbb1d1aa89f2cc6ce5b