Merge \"Fixes the system server hang forever issue caused by the monkey not read completed the sync pipe.\"
am: e85e33cfd7

Change-Id: Ic3a4d45b844cb8661b4287bdac26c65d6281ad17