am db69a883: am 28caf262: Update imports to android-common

Merge commit 'db69a88303ca121359321c3f8b965f0c98c13a12'

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