Merge change I8874a405 into eclair

* changes:
  Refactor class/method names used by layoutlib_create.