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

Change-Id: Icddb2f285d9f08a6fce89dcac69cf38259d9edf6