Cherry-picks5501d1e50(stub-header updates, superseded by4223ca2ffrelocation); resolves 1 content + 24 modify/delete conflicts; validates BUILD_RTI=ON BUILD_GRANTLEE=ON incl. Tools Groups 6-11.
Cherry-picks5501d1e50(stub-header updates, superseded by4223ca2ffrelocation); resolves 1 content + 24 modify/delete conflicts; validates BUILD_RTI=ON BUILD_GRANTLEE=ON incl. Tools Groups 6-11.