am 017982ef: (-s ours) am 78df1264: am 4de45496: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '017982ef01534aabda8aae9437d0621fc5b0c549':
am fb02186e: am 58c4e74b: am 2a4c0767: am 9e77704d: mako: update USB PIDs

* commit 'fb02186e1923ffc9de9f58083d114b1816ad3f80':
am 9999f691: am 466fd723: am e6d8824f: am 3ed28946: mako: set the default usb config to MTP

* commit '9999f6911619c9c3d5a60d2cec5a89b6531c026d':
am 33be774e: am 9b1f5d11: am d4d744fa: am 6b9b43c8: Add default settings for mako

* commit '33be774e0a4c4b35ed1e1692906d91c483363605':
am 123fe083: (-s ours) am fcc97a6d: am 5ce0b9c3: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '123fe08307be8a59dcbe1955296ff74350a03a08':
am 030fc4d8: am 1bace6ac: am aff3afdd: am c60af081: Adding misc/ partition to recovery.fstab for mako.

* commit '030fc4d864d205c213dc5c398d63fabe748a5961':
am ae4dc8b2: am 95267b86: am 44ef6ca7: am 3b2b875a: Fix permissions for /firmware partition

* commit 'ae4dc8b29886b2db6aebad88d35d1e5dfaaed925':
am 992bb980: (-s ours) am 6c48e61b: am 3762fdd0: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '992bb980f3674d53aa8d4f95e8c6cd05eaa34757':
am abbb6e11: am 998cffeb: am 78961552: am dcb0fdc8: audio: add Dual MIC scenario in call feature

* commit 'abbb6e11ac52ad8a51a58fd7acc7e66a4da2ec44':
am 98e25020: am 53bdad5a: am 13abdfff: am 25bb1062: audio: add separate audio Input path feature

* commit '98e250205b905dd161c752a177659995ced67002':
am 5c7f7eed: am cbca39c1: am 827bd773: am 4810cd96: audio: Handset/Speaker Phone voice.

* commit '5c7f7eeddb0a9d92d5fd847f25cdb1ca8f89d530':
am 0dcc31f6: am 29cd4eaf: am 867a21ca: am 7582e4dd: mako: audio: enable the QACT connection

* commit '0dcc31f696375d14fd50cb787c0fc4172680948f':
am 6478b367: am d032fdd6: am c54be85f: am 3936e4a2: mako: adjust the haptic feedback

* commit '6478b367f5b496e99868726c4b4f42e3fc48ea1e':
am 5cbfc63a: (-s ours) am 8e94b5e6: am 565e8f03: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '5cbfc63aa07663a51888a5e2e490a20d95eeeef2':
am c3d6f239: am c5a3e2e1: am a93b6d09: am c1de8aaf: audio: apply audio tuning parameter

* commit 'c3d6f2392ea33951156bca2c6afe14d5accde29f':
am ca72cc1a: am 8fc76ac1: am ea06d1ee: am 595ae243: fix build - specific TARGET_ARCH

* commit 'ca72cc1a9883b5cf855a1cf44ef77697f3c34fb9':
am 6fd1ae58: am a499c9b9: am ff59c4ce: am cb1aefed: Mako: NFC: Disable low-power tag detect.

* commit '6fd1ae58602fb6a5efa9c99232ad1bd95e0d6c3c':
am cfc1ce11: am 37ca63a3: am 646093a1: am 9d7ffe79: Merge "Update config.xml overlay for new key config_overlay_locationProviderPackageNames" into jb-mr1-dev

* commit 'cfc1ce11d8bcda66e1ced9c205d61643be375828':
am a21f43dd: am 2a0b27b1: am fed5edcf: am ebf69094: mako: overlay to enable screen saver feature

* commit 'a21f43ddc4b39e1bd472eb46dfcbfda6feac59ef':
am b011a019: am f24a960e: am 2676ed24: am d2394d13: Specify destination sdcard mount point.

* commit 'b011a01901f2accc6ae780a966aec414e71bbe96':