am cf66f587: (-s ours) am 4e08a985: Merge "fix build DO NOT MERGE" into gingerbread

Merge commit 'cf66f587514a935c290c8c9558243a48ba0243eb'

* commit 'cf66f587514a935c290c8c9558243a48ba0243eb':
  fix build DO NOT MERGE