Remove VNDK warning. am: 2bd4342234 am: af13aaf618
am: cfcf4277df

Change-Id: I7851e037c331c511702d5a836ebc313828627b9f