Merge "Regenerate graphics-base.h"