Merge "Re-export exported includes from whole_static_libs"