Use our canonical header guard naming

Change-Id: I06c9c55f75dc13893e29ec6cc96726a60c34846c