am 2b8ba2fa: Merge "Clean up warnings in soslim" into gingerbread

Merge commit '2b8ba2fa20505630fbbafaf04d20e8c6d05f3b25' into gingerbread-plus-aosp

* commit '2b8ba2fa20505630fbbafaf04d20e8c6d05f3b25':
  Clean up warnings in soslim