am b386a86c: Merge change I8018f091 into eclair

Merge commit 'b386a86c1c131832c8f9955a5a57a2fa13609d15' into eclair-plus-aosp

* commit 'b386a86c1c131832c8f9955a5a57a2fa13609d15':
  Add very simple input path. Fix end-of-line issues.