Remove VNDK warning. am: 2bd4342234
am: af13aaf618

Change-Id: I4cf947cab70259f471ff62165ec4f89d48c7b120