Merge "Follow minikin header structure changes"