am e615e851: resolved conflicts for merge of 8c425a9d to honeycomb-plus-aosp

* commit 'e615e85153ac11b809c124368eb99c42182b327b':
  Fix "argument list too long"