Merge "forward declare header string definitions" am: 04b5a124bc
am: 988958c08d

Change-Id: I1752cd91c0eca84e718dc16832ccb1e2f63b0ac7