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

Change-Id: I2103207981552b000e2402cba4311085977baab0