am 0055c650: Merge "b/2483367 Moving OneTimeInitializer to vendor/google" into froyo

Merge commit '0055c650940d5c4dbc75998e362c645ec358ec45' into kraken

* commit '0055c650940d5c4dbc75998e362c645ec358ec45':
  b/2483367 Moving OneTimeInitializer to vendor/google