common: Fix Oppo brand detection

Change-Id: I38cf5c65277f44f2b70d58b7418694fefc3cb6fd
Merge branch "cm-11.0" into kylin