Merge pull request #2 from koush/master

update
Merge remote-tracking branch 'koush/master' into cm-10.2
Merge remote-tracking branch 'koush/master' into cm-10.2
Merge remote-tracking branch 'koush/master' into cm-10.2
InputStreamDataEmitter blocking fixes

Change-Id: I8e728545b5e20c6876572cdfa6af175fd7ebae72