Merge "Fix build (restore deleted assets)." into gingerbread