Merge "Ensure consistent handling of generated headers/dirs" am: a0d58893fc am: 44242ee450

Change-Id: Ia79588237460b26927cfb09379ca9685741f317f