otter2: Dedupe flags

Change-Id: Ibec2f3b0e2d8e2d42a45ddb5596faa4c5207854e
otter2: Fix default notification/alarm sounds

Use default ringtone overridden in common_full_tablet_wifionly.mk

Change-Id: Ide51821e80174fc1b7ea15ff3c9e02716df88ce1
Merge "otter2: Dedupe flags" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0