Merge "Support for fake bold in Minikin builds"