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

Change-Id: Ia7040fbd667d8dffca739b505f6eed8d249cd415