Squashed commit of the following:

commit e87aaaf637d7f9f756cff57cfbbfdb44c20adbeb
Merge: 7633637 8537dae
Author: The Android Automerger <android-build@google.com>
Date:   Thu Jun 27 05:55:23 2013 -0700

    merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev

commit 763363745be3aa2ad10005d5a30a29e84d69c425
Author: Mekala Natarajan <mekalan@codeaurora.org>
Date:   Wed Jun 26 15:55:28 2013 -0700

    Send the client pid along with request to PerfLock

    Bug: 9578048
    Change-Id: I2c615cd7488bb60b685f75adc56bdc625c9d1874

commit 8537daeb2e794d936ec86b69c6441ada0ce9afc7
Merge: 59fbd17 d41c44c
Author: The Android Automerger <android-build@google.com>
Date:   Wed Jun 26 12:17:36 2013 -0700

    merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev

commit 59fbd175b2373f8cafeafac594005fed412385aa
Author: Mekala Natarajan <mekalan@codeaurora.org>
Date:   Thu Jun 20 16:00:24 2013 -0700

    Change name of perf socket

    Bug: 9325608
    Change-Id: I888ad372469864dfe4e7482d6be6298cbf46c878

commit 66e5ad149393a5875253cb7db290f9731d1f3c7a
Author: Mekala Natarajan <mekalan@codeaurora.org>
Date:   Wed Jun 19 15:45:45 2013 -0700

    Disable sync on thread migration feature for video encode/decode and display on/off cases

    Bug: 9325608
    Change-Id: I43cb1691365220fbd88c89af6a6b3394564101d5

commit d41c44c07c7b89ccceee3493220a9da689af4b66
Author: Iliyan Malchev <malchev@google.com>
Date:   Fri May 24 19:34:16 2013 +0000

    Revert "add coreboost feature and enable it when display is on"

    This reverts commit d9de16eb13b5a295b555bc29ec58c517139f736e

    Causes 15% power regression in on-screen tests on mako.  This will revert it for Flo as well.

    Change-Id: Ib7cd0bf6e225fbdc8c800f5d55a087f1fc2704eb

commit 66e45020bb429934f874c748e495acc032040c8b
Author: Iliyan Malchev <malchev@google.com>
Date:   Fri May 24 19:34:16 2013 +0000

    Revert "add coreboost feature and enable it when display is on"

    This reverts commit d9de16eb13b5a295b555bc29ec58c517139f736e

    Causes 15% power regression in on-screen tests on mako.  This will revert it for Flo as well.

    Change-Id: Ib7cd0bf6e225fbdc8c800f5d55a087f1fc2704eb

commit 54617c959f4ba2bf799d80947353d5276660ba1e
Author: Vince Leung <vincentl@codeaurora.org>
Date:   Wed May 22 20:04:41 2013 -0700

    add coreboost feature and enable it when display is on

    Change-Id: I12aec9092142a162b0ea42b8dc2ae94677549b0a

commit d9de16eb13b5a295b555bc29ec58c517139f736e
Author: Vince Leung <vincentl@codeaurora.org>
Date:   Wed May 22 20:04:41 2013 -0700

    add coreboost feature and enable it when display is on

    Change-Id: I12aec9092142a162b0ea42b8dc2ae94677549b0a

Change-Id: Ibaaf7069ec8399a897bc56468dee69f433933124