Merge changes from topic "multithreaded-header-linker-ir"
am: 6a233fe18a

Change-Id: I0ac785a3c0e1fa007932a465935979dca4fd6470