am f799f32d: am 115def16: Update imports to android-common

Merge commit 'f799f32d7951eb6d51d43ce763a896bda4ec7ea9'

* commit 'f799f32d7951eb6d51d43ce763a896bda4ec7ea9':
  Update imports to android-common