Merge "Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES"