am 71060f29: Merge change I8874a405 into eclair

Merge commit '71060f29855745893c122e8b93cf7a723186931b' into eclair-mr2

* commit '71060f29855745893c122e8b93cf7a723186931b':
  Refactor class/method names used by layoutlib_create.