Merge "Fix for compile error when BUILD_HEADER_LIBRARY is used" am: 69e8252aec
am: e4f88be6ed

Change-Id: Ia7e126b063378e454b3a0d41c546c41de025c8f0