Merge "Remove unused layouts." into honeycomb