Merge commit '12da9d7472ae87b841575d5358e19f143d12f900' into gingerbread-plus-aosp * commit '12da9d7472ae87b841575d5358e19f143d12f900': Fix buffer compacting in NativeDaemonConnector
Merge commit '12da9d7472ae87b841575d5358e19f143d12f900' into gingerbread-plus-aosp * commit '12da9d7472ae87b841575d5358e19f143d12f900': Fix buffer compacting in NativeDaemonConnector