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