Merge "Ensure consistent handling of generated headers/dirs" am: a0d58893 am: 44242ee4 am: 4d54a5a5 Change-Id: I66ccacab3c2f411afdad5f91cd243b66ad519456