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

* commit '78df12645179409c93b1af5d369ede4c77078ef2':
  set mako ramdisk location with mkbootimg argument
am 58c4e74b: am 2a4c0767: am 9e77704d: mako: update USB PIDs

* commit '58c4e74bc7cceb071eaf37d86a228705b8a8419c':
am 466fd723: am e6d8824f: am 3ed28946: mako: set the default usb config to MTP

* commit '466fd7231a035da1a657a250290a3b387242035b':
am 9b1f5d11: am d4d744fa: am 6b9b43c8: Add default settings for mako

* commit '9b1f5d117ef4a9ba1eedcb6e869eca831f44df45':
am fcc97a6d: (-s ours) am 5ce0b9c3: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'fcc97a6d3a7c3c70ecea5888b8ee9182cddf34e6':
am 1bace6ac: am aff3afdd: am c60af081: Adding misc/ partition to recovery.fstab for mako.

* commit '1bace6ac0db037b9f87342c32dbe886b34cedf55':
am 95267b86: am 44ef6ca7: am 3b2b875a: Fix permissions for /firmware partition

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

* commit '6c48e61b0d5f697eea5f55a00241980e6d2bcd07':
am 998cffeb: am 78961552: am dcb0fdc8: audio: add Dual MIC scenario in call feature

* commit '998cffebbf2e9512efac1a9d083b0ff2706130fe':
am 53bdad5a: am 13abdfff: am 25bb1062: audio: add separate audio Input path feature

* commit '53bdad5a94dae02759f7755bf67a5b7065285fad':
am cbca39c1: am 827bd773: am 4810cd96: audio: Handset/Speaker Phone voice.

* commit 'cbca39c145b9498339392b4e3e2e5d99f7dea508':
am 29cd4eaf: am 867a21ca: am 7582e4dd: mako: audio: enable the QACT connection

* commit '29cd4eaf46b4333d308c584275774d39c790dcac':
am d032fdd6: am c54be85f: am 3936e4a2: mako: adjust the haptic feedback

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

* commit '8e94b5e6bcae31bd3a498e8649f2853fb440bdfc':
am c5a3e2e1: am a93b6d09: am c1de8aaf: audio: apply audio tuning parameter

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

* commit '8fc76ac155af876117000ea32ccde8253740e8cf':
am a499c9b9: am ff59c4ce: am cb1aefed: Mako: NFC: Disable low-power tag detect.

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

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

* commit '2a0b27b1cccf3ec165014f32b7a28459a9b14015':
am f24a960e: am 2676ed24: am d2394d13: Specify destination sdcard mount point.

* commit 'f24a960e2a14cf680d51575f4ca8dec544d51af7':