am 672ad8d6: am 8ac84564: Merge "Move assets to default location, instead of xlarge only." into honeycomb-mr2

* commit '672ad8d66f61db0804fcf4ba9a0db067272a4b50':
  Move assets to default location, instead of xlarge only.