Merge "Add warning for legacy VNDK use" am: 84cce1dec4 am: 0c397b9484
am: dd9c19b455

Change-Id: I261d60b287ad8cd55c1ca6b6dd586557b5700690