Updates

-Track Bluetooth from CM
-Add Oppo N1
-Follow m7 updates
-Track frameworks_opt_vcard from cm