Merge remote-tracking branch 'cm/cm-11.0' into du44

PS2: fix oppo redeclaration

Change-Id: I5a608a38360efd79fad601d3850732bd449ebe89