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

* commit '8ac8456491e1409a071c7cf4e164440aeec7c4dd':
  Move assets to default location, instead of xlarge only.