merge in klp-release (no-op)
mako: Fix the modem crash on encryption phone

There is an efs sync problem because of class type of rmt_storage service.
When encrypting phone, modem crash may occur due to not being able to sync
properly between AP and CP. So, rmt_storage class should be a core class.

Bug: 11325693

Change-Id: I67fa1fe6a0f2863de0b83fc7d7d277c26bd0808b
Update propietary blobs for mako

Change-Id: I860d3ab67a3ee6577658b8695755a7437c5dc43b
Merge "Update propietary blobs for mako" into klp-dev
camera: Handle camcorder trigger while snapshot is in process

Handle camcorder trigger while snapshot is in process

Bug: 11062739
Change-Id: Ib2753d11f4a72d7c3cc2d3bae458b54556a6dc15
Bluetooth: Enable BTA_SKIP_BLE_READ_REMOTE_FEAT

Enables BTA_SKIP_BLE_READ_REMOTE_FEAT to skip querying
for the BLE READ REMOTE FEATURES

bug:11450568
Change-Id: I7dab02cd7395a796905db604b76a7cf3e5cd1265
Merge "Bluetooth: Enable BTA_SKIP_BLE_READ_REMOTE_FEAT" into klp-dev
mako: Remove logwrapper

Bug: 11116723
Change-Id: If2a02338a8ea3bed63a8b092a0f6e2a5a205661c
mako: Use own apns-conf based on JB-MR2

b/10293040 - [HH][Canada/Rogers] Request to show designated APN
             according to SIM card or kind of device(UMTS / LTE APN)
b/11440251 - [France SFR] MMS do not work due to wrong APN
Change-Id: I4ad3bd19c30bfe4cc58dd11d241ba36b912d1df4
mako: Update apns from operator's requests

Updated Profile:
- Canada Eastlink(dual imsi) 206-01: add new profile
- Canada Wind(dual imsi) 222-01: add new profile
- Canada Wind(dual imsi) 222-88: add new profile
- Canada TELUS 302-220: add mvno type
- Canada Koodo 302-220: add mvno type
- Canada PC mobile 302-220: add mvno type
- Canada TELUS 302-221: add new profile
- Canada Koodo 302-221: add new profile
- Canada PC mobile 302-221: add new profile
- Canada Fido 302-370: update mmsproxy
- Canada WIND Mobile 302-490: update protocol
- Canada Videotron 302-510: add new profile
- Canada Bell 302-610: remove mmsproxy
- Canada MTS 302-660: add mvno type, update mmsproxy,mmsport,protocol
- Canada MTS 302-370: add mvno type, update mmsproxy,mmsport,protocol
- Canada Rogers 302-720: update mmsproxy
- Canada Rogers 302-720: update profile
- Canada SaskTel 302-780: update mmsc
- US T-Mobile: update apn name, protocol, roaming protocol
  (301- 160,200,210,220,230,240,250,260,270,310,490,580,660,800,880)
- Estonia Tele2 248-03: update profile for prepaid and postpaid
- Spain Jazztel 214-21: updata mmsc

b/10293040 - [HH][Canada/Rogers] Request to show designated APN
             according to SIM card or kind of device(UMTS / LTE APN)
b/11440251 - [France SFR] MMS do not work due to wrong APN
Change-Id: Ib33956e640395cf426308370fc6d6aa331d1dad9
mako: wlan: Add tdls_external_control=1

Bug: 11631777

Change-Id: I35ec42182d779511e59679a9d0887de7e50d0d3d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
mako: update WCNSS_qcom_cfg.ini for TDLS auto mode

Bug: 11631777
Change-Id: I19b23071a31a546d349ad238426cc3283762d6da
mako: update WCNSS_qcom_cfg.ini to optimize TDLS

New parameters for TDLS auto mode after discussion with Qualcomm.
Bug: 11631777

Change-Id: Ib858f2dfe57945263ebd9d189b9b829437b6a871
Merge remote-tracking branch 'aosp/kitkat-mr1-release' into kk