Merge "Add explicit hb-version.h"