Turn on BLE, GATT, and SMP of Bluetooth stack

Change-Id: I138001097e5a652e9721f913bbd0bf2fb7ddfebb
Revert "Turn on BLE, GATT, and SMP of Bluetooth stack"

This reverts commit e18fbd391c4cacf7ca90e494874d524b3d771482.

Change-Id: Ia7e7190cf89bb29cda747e8f8134e596c3090fa9
Telephony: ignore_sim_network_locked_events -> ignore_perso_locked_events

Change-Id: Id21be969436761139076bcd94a6eee45c611fd1a
Swapart: Swap artist

Change-Id: I215bd6f08ef7495b89c445afb7925d366d91c508
Update extras.txt

Change-Id: Ic0b4ee193a39d587470cfe40cba9c711827aa42a
Update extras.txt

Apollo and LockClock now fit in /system.

Change-Id: I1101639233f11e688acdf9e86e2daa055391e549
Merge remote-tracking branch 'cm/cm-11.0' into HEAD