Streamline oppo vendors

Change-Id: I31f5b2f90dc4b4f75a1739d895e88929a02a794d