Merge "Add required header_libs"