Merged changes from build files and layouts.