am 1137be1a: Follow raw pointer and sp<> conventions

* commit '1137be1a686fdfc9f02c3aca7c33f28006df4742':
  Follow raw pointer and sp<> conventions