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

Change-Id: I50b47f8244a9c3c432b499b2ef730932794a83e9