am aea40e3c: (-s ours) am a1af0d7c: Merge "Fix SDK build" into gingerbread

Merge commit 'aea40e3c5746d754f96b76b7845bbbf7effe2677'

* commit 'aea40e3c5746d754f96b76b7845bbbf7effe2677':
  Fix SDK build