This is causing problems with making the linker relocatable. Change-Id: I53e37fba52eabd3145130712d6e9bff074aed493
16e7050c
e9b1d0ee
f8f95fc8