ABC re-order for vendor files

Change-Id: I7c3ff2eda6e835224eaea6991e03f264ea5944ea